7203021bbd54ac11dfc7dbecd225c786bb3b64d2,app/src/main/java/de/xikolo/controller/secondscreen/SecondScreenFragment.java,SecondScreenFragment,initSeconScreenActions,#WebSocketMessage#,122

Before Change


            }

            // quiz
            if (moduleItems == null) {
                Result<List<Item>> result = new Result<List<Item>>() {
                    @Override
                    protected void onSuccess(List<Item> result, DataSource dataSource) {
                        moduleItems = result;
                        int itemIndex = moduleItems.indexOf(item);

                        Item nextItem = null;
                        if (itemIndex + 1 < moduleItems.size()) {
                            nextItem = moduleItems.get(itemIndex + 1);
                        }

                        if (nextItem != null && Item.EXERCISE_TYPE_SELFTEST.equals(nextItem.exercise_type)) {
                            viewQuiz.setVisibility(View.VISIBLE);
                        }
                    }
                };

                itemModel.getItems(result, message.payload().get("course_id"), message.payload().get("section_id"));
            } else {
                int itemIndex = moduleItems.indexOf(item);

                Item nextItem = null;
                if (itemIndex + 1 < moduleItems.size()) {
                    nextItem = moduleItems.get(itemIndex + 1);
                }

                if (nextItem != null && Item.EXERCISE_TYPE_SELFTEST.equals(nextItem.exercise_type)) {
                    viewQuiz.setVisibility(View.VISIBLE);
                }
            }

After Change


            }

            // quiz
            if (module != null && module.items != null) {
                int itemIndex = module.items.indexOf(item);

                final Item nextItem;
                if (itemIndex + 1 < module.items.size()) {
                    nextItem = module.items.get(itemIndex + 1);
                } else {
                    nextItem = null;
                }

                if (nextItem != null && Item.EXERCISE_TYPE_SELFTEST.equals(nextItem.exercise_type)) {
                    viewQuiz.setVisibility(View.VISIBLE);
                    viewQuiz.setOnClickListener(new View.OnClickListener() {
                        @Override
                        public void onClick(View v) {